reworked model architecture
resolved conflicts