Updated logic flows. Partial implementations!