Made some updates

Added some functionality