Simplified how that worked a bit