modified for Current Source class