Fixed values, added sources and calculations