merged in marks stuff