Applied the proxy pattern suggested for data
Fixed problems with some return values
double blank line