Improved and recompiled