Added more functionality
trying to merge