beautiful changes & new feature