removed hardocoded values