Before moving out front end code