Removed timeout and merged so it works