Replaced harcoded values