Cleaned up for Dev-Rev2