Reverted Last commit + removed /opme