Fucked up
fixed some prev. errors