annotated, added some checks to custom actions