Modification to getting rid of errors.

Will be syncing with Carlos Database