Changed Constants to Parameters