UPDATE: improved comments