comit before work BEWARE BUGS