Added more functionality

up