Final changes to make it work