Undid IIFE changes. Changed method order.