A few changes to get it working as you want

So here are the changes