Use intended method
Forgot to commit this file
Implemented time-outs based on timestamps
Improved labels