Merging lets not mess this one up again