Minor changes to already implemented procedured