Modified front-end working.
Merge