fixed sprint 8 issues