+logic improvements