updated for own content