updating schema and logic
merging master