Simplified form logic and got rid of awesome