Changed code for hardcodings