kinda fixed the magic numbers