Some changes

Hopefully final commit