Attempt to revert to working stuffs