fixed functiionality cause i'm a fucking asshole