lets see if it works for now, more changes incoming