Columns fixed, merging stuff with Murphy