Update

Added more features