merge trying to get it working