fixed hardcode
hardcode improovements