Applyed Sande's modifications