Recompiled for deployment