reverted to the point were it was working that way we can start from something that works :]