Changed code for hardcodings added constants