Fixed all methods