--removed hardcodings