* Fixing it up a bit