Three Six Nine: Add more features

Add more features