Startup

Add more conditions to calculations