work on templates and basket