Applying changes to #5