Some changes
More tweaks