Fixed a few issues with this one