added s3 and avatars