Changed some things around, nothing important