cleaned up a bit from merge