Real version + Fixes