Added signal disconnection and reworked position estimation