Fixed issue 1 - 4.