Timer added and some design changes