Added more functionality and info