Merged With Mark and Bug Fix