Pull request to update functionality

Yaaaay