okay this should fully work now