There were a lot of bugs due to the new additions. Reverted them back