Revamped the Bishop class.