Updated to reflect changes made to master