Commented out features only in Gabby's version (will copy in later)