Merged Christian and Joe's code
Updates