Changed the Way the System recieves the parameter
Added Fallback if not enough parameters are entered