Considered some suggestions