Second clean merge attempt

This is a very important addition