merged changes from skibz