Major fix
Merged with bryan