removed checks for undefined... need to use parsing instead