more changes. Not working 100% yet