some front code code
merged with updates