Revamped vars a bit