@update - init and refactor items for better organisation