Working on calculations

Reverted back to previous calculations