updated for local requirements