finally got rid of the asynchronous tasks :P
[#71]