Beta Testing

Minor Changes