Cleaned up for a5 submission