added basic functionality
merged with ramya's code