Updated and Combined - softcoded drawing