Modified by dev2
st1234: conflict solved