product owner specified

fixed and ready according to product owner specifications