added some useful qualifiers