Edited Raymond branch to work