Moving towards solving issue #13 & #26