updated to not fuck up