updated for coding standards