Updated framework
Updated style