added new calls for compliancy, not working yet