made changes to support catkinization