Now it works
minor updates