modified by master priys