Final updates, added constrints from observations