fixing issue with getting move options based on color
merging changes