adjusted code a bit... i swear