Commented out some weird code at the bottom