prepared for namechange + tested

here you go