some methods changed - more tuned up