corrected errors and temporary hardcoded numbers are used