Changed everything to ACTUALLY work