Removed proportional params. Code is a mess.