trying to smothen the differences between server and client
merge