Fixed problem with coupling, MAJOR Changes