changed code layout