partial changes by lyubo