issue#3, issue#5 - dla customera core i rest