using helpers
merged the final changes