Commented out parts back in