Further changes to make things work