Cleaned up for move of alto-check