Added the recent changes to the client