Testing

merging testing changes to beta