anotations added and explicit comparation added