Changed code to provide for different markers, also deleted commented code