Added updates from original Master