added regalables support
merged