Final Changes to make things work