Updated structure, changed Chinmay code