Added more functionality than previous update