Tweaked/added stuff