Replaced hardcoded values and added Run Time stat