Merge changes to add functionaltiy