cleaned up assumptions