mantis #133
updated task 3
mantis #133
task 2