updated back simplified version, ready to do sanity checks