removed hardcodings