fix procedures
merge fixes