Added updated code since re-clean