updated with new action listeners