minor changes
placing block fixed
checking merge again
checking merge again again