merged changes from skralg

merged changes from skralg