few modification frontEnd