marc branch changes

Added more stuuf