Updated for sh support