first try of fixing on updates