Reverted to zoraja's codebase