Merged code

Kevin was here