Ha non distructive

Applied comments, please look at it one more time :)