fixed shit 2.0