parsed some add. fields and optimized some code