Added feature #2