updated with more setting