bypassing and everything works, this is possibly the final version:)