Further Revisions on Front-End