few changes to make things work